From: tsteven4 Date: Thu, 7 Mar 2019 22:34:18 +0000 (-0700) Subject: normalize connections in GUI (#316) X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~31 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=90799c098eed78ab2fbda265a86d0434efac29b8;p=gpsbabel.git normalize connections in GUI (#316) as suggested by clazy. --- diff --git a/gui/gmapdlg.cc b/gui/gmapdlg.cc index d38948410..8db82dcf7 100644 --- a/gui/gmapdlg.cc +++ b/gui/gmapdlg.cc @@ -205,14 +205,14 @@ GMapDialog::GMapDialog(QWidget* parent, const QString& gpxFileName, QPlainTextEd connect(mapWidget_, SIGNAL(waypointClicked(int)), this, SLOT(waypointClickedX(int))); connect(mapWidget_, SIGNAL(routeClicked(int)), this, SLOT(routeClickedX(int))); connect(mapWidget_, SIGNAL(trackClicked(int)), this, SLOT(trackClickedX(int))); - connect(ui_.treeView, SIGNAL(doubleClicked(const QModelIndex&)), - this, SLOT(treeDoubleClicked(const QModelIndex&))); - connect(ui_.treeView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(selectionChangedX(const QItemSelection&, const QItemSelection&))); + connect(ui_.treeView, SIGNAL(doubleClicked(QModelIndex)), + this, SLOT(treeDoubleClicked(QModelIndex))); + connect(ui_.treeView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), + this, SLOT(selectionChangedX(QItemSelection,QItemSelection))); ui_.treeView->setContextMenuPolicy(Qt::CustomContextMenu); - connect(ui_.treeView, SIGNAL(customContextMenuRequested(const QPoint&)), - this, SLOT(showContextMenu(const QPoint&))); + connect(ui_.treeView, SIGNAL(customContextMenuRequested(QPoint)), + this, SLOT(showContextMenu(QPoint))); connect(ui_.copyButton, SIGNAL(clicked()), this, SLOT(copyButtonClickedX())); diff --git a/gui/map.cc b/gui/map.cc index 7dfe1272e..ee318d036 100644 --- a/gui/map.cc +++ b/gui/map.cc @@ -86,8 +86,8 @@ Map::Map(QWidget* parent, this->page()->setWebChannel(channel); // Note: A current limitation is that objects must be registered before any client is initialized. channel->registerObject(QStringLiteral("mclicker"), mclicker); - connect(mclicker, SIGNAL(markerClicked(int, int)), this, SLOT(markerClicked(int, int))); - connect(mclicker, SIGNAL(logTime(const QString&)), this, SLOT(logTime(const QString&))); + connect(mclicker, SIGNAL(markerClicked(int,int)), this, SLOT(markerClicked(int,int))); + connect(mclicker, SIGNAL(logTime(QString)), this, SLOT(logTime(QString))); #endif QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html"; @@ -177,8 +177,8 @@ void Map::showGpxData() // Historically this was done here in showGpxData. MarkerClicker* mclicker = new MarkerClicker(this); this->page()->mainFrame()->addToJavaScriptWindowObject("mclicker", mclicker); - connect(mclicker, SIGNAL(markerClicked(int, int)), this, SLOT(markerClicked(int, int))); - connect(mclicker, SIGNAL(logTime(const QString&)), this, SLOT(logTime(const QString&))); + connect(mclicker, SIGNAL(markerClicked(int,int)), this, SLOT(markerClicked(int,int))); + connect(mclicker, SIGNAL(logTime(QString)), this, SLOT(logTime(QString))); #endif this->logTime("Start defining JS string"); diff --git a/gui/processwait.cc b/gui/processwait.cc index 19b027088..c489c429a 100644 --- a/gui/processwait.cc +++ b/gui/processwait.cc @@ -84,8 +84,8 @@ ProcessWaitDialog::ProcessWaitDialog(QWidget* parent, QProcess* process): connect(process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(errorX(QProcess::ProcessError))); - connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(finishedX(int, QProcess::ExitStatus))); + connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(finishedX(int,QProcess::ExitStatus))); connect(process, SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardErrorX())); connect(process, SIGNAL(readyReadStandardOutput()),